summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMai <mai.iam2048@gmail.com>2023-01-27 01:07:50 +0100
committerGitHub <noreply@github.com>2023-01-27 01:07:50 +0100
commite54d08fc1fa79f6c0e66f2e2ef06f21ca36cf881 (patch)
tree6b0fd0ba833601d405256c267ccea7bad46a22a9
parentMerge pull request #9683 from german77/high_power_joycon (diff)
parentkernel: unbreak min/max template deduction on Apple Clang (diff)
downloadyuzu-e54d08fc1fa79f6c0e66f2e2ef06f21ca36cf881.tar
yuzu-e54d08fc1fa79f6c0e66f2e2ef06f21ca36cf881.tar.gz
yuzu-e54d08fc1fa79f6c0e66f2e2ef06f21ca36cf881.tar.bz2
yuzu-e54d08fc1fa79f6c0e66f2e2ef06f21ca36cf881.tar.lz
yuzu-e54d08fc1fa79f6c0e66f2e2ef06f21ca36cf881.tar.xz
yuzu-e54d08fc1fa79f6c0e66f2e2ef06f21ca36cf881.tar.zst
yuzu-e54d08fc1fa79f6c0e66f2e2ef06f21ca36cf881.zip
-rw-r--r--src/core/hle/kernel/k_page_table.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp
index fbd28f5f3..2e13d5d0d 100644
--- a/src/core/hle/kernel/k_page_table.cpp
+++ b/src/core/hle/kernel/k_page_table.cpp
@@ -2144,8 +2144,8 @@ void KPageTable::RemapPageGroup(PageLinkedList* page_list, KProcessAddress addre
const KMemoryInfo info = it->GetMemoryInfo();
// Determine the range to map.
- KProcessAddress map_address = std::max(info.GetAddress(), start_address);
- const KProcessAddress map_end_address = std::min(info.GetEndAddress(), end_address);
+ KProcessAddress map_address = std::max<VAddr>(info.GetAddress(), start_address);
+ const KProcessAddress map_end_address = std::min<VAddr>(info.GetEndAddress(), end_address);
ASSERT(map_end_address != map_address);
// Determine if we should disable head merge.